From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 7 Apr 2010 07:15:33 +0000 (+0100)
Subject: Fix 32bit PAE compilation error introduced by 1GB patches
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12430
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=449e0d3d0e781aa53b70ae753f9c9c1511ce7e61;p=xen.git

Fix 32bit PAE compilation error introduced by 1GB patches

Signed-off-by: Wei Huang2 <wei.huang2@amd.com>
---

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index 7bb904d395..ba6f191d8b 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -1534,12 +1534,15 @@ static mfn_t p2m_gfn_to_mfn_current(unsigned long gfn, p2m_type_t *t,
     {
         l1_pgentry_t l1e = l1e_empty(), *p2m_entry;
         l2_pgentry_t l2e = l2e_empty();
-        l3_pgentry_t l3e = l3e_empty();
         int ret;
+#if CONFIG_PAGING_LEVELS >= 4
+        l3_pgentry_t l3e = l3e_empty();
+#endif
 
         ASSERT(gfn < (RO_MPT_VIRT_END - RO_MPT_VIRT_START) 
                / sizeof(l1_pgentry_t));
 
+#if CONFIG_PAGING_LEVELS >= 4
         /*
          * Read & process L3
          */
@@ -1585,7 +1588,7 @@ static mfn_t p2m_gfn_to_mfn_current(unsigned long gfn, p2m_type_t *t,
             
             goto out;
         }
-
+#endif
         /*
          * Read & process L2
          */